Merge pull request #678 from soby-mathew/sm/PSCI_AArch32

author danh-arm <[email protected]>

Thu, 18 Aug 2016 10:38:19 +0000 (11:38 +0100)

committer GitHub <[email protected]>

Thu, 18 Aug 2016 10:38:19 +0000 (11:38 +0100)
author danh-arm <[email protected]>
Thu, 18 Aug 2016 10:38:19 +0000 (11:38 +0100)
committer GitHub <[email protected]>
Thu, 18 Aug 2016 10:38:19 +0000 (11:38 +0100)
diff --cc docs/user-guide.md
Simple merge
diff --cc drivers/arm/gic/v3/gicv3_main.c
Simple merge
diff --cc plat/rockchip/rk3399/platform.mk
Simple merge
author	danh-arm <[email protected]>
	Thu, 18 Aug 2016 10:38:19 +0000 (11:38 +0100)
committer	GitHub <[email protected]>
	Thu, 18 Aug 2016 10:38:19 +0000 (11:38 +0100)
		1	2
docs/user-guide.md	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/arm/gic/v3/gicv3_main.c	patch \|	diff1 \|	diff2 \|	blob \| history
plat/rockchip/rk3399/platform.mk	patch \|	diff1 \|	diff2 \|	blob \| history